CSTACKEX-262: Support for Compute + Volume migration and Volume migration by sandeeplocharla · Pull Request #112 · NetApp/cloudstack

sandeeplocharla · 2026-10-05T05:54:57Z

Description

This PR...

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
Build/CI
Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Use case	Suite	Tests	Result
Live VM migration with volumes	migration_live	22	Pass
Stopped VM storage migration	migration_stopped	15	Pass
Volume migration (detached or stopped-attached)	migration_volume	23	Pass
iSCSI pool lifecycle	iscsi_pool_lifecycle	8	Pass
iSCSI pool with volumes	iscsi_pool_volumes	7	Pass
iSCSI zone-scoped pool	iscsi_zone_pool	4	Pass
iSCSI volume lifecycle	iscsi_volume	5	Pass
iSCSI VM volume attach	iscsi_instance	8	Pass
NFS3 pool lifecycle	nfs3_pool_lifecycle	8	Pass
NFS3 pool with volumes	nfs3_pool_volumes	7	Pass
NFS3 zone-scoped pool	nfs3_zone_pool	4	Pass
NFS3 volume lifecycle	nfs3_volume	5	Pass
NFS3 VM volume attach	nfs3_instance	8	Pass

Live VM with volumes (`migrateVirtualMachineWithVolume`)

Test	What it covers	Status
test_01_nfs3_default_primary_to_cluster	DefaultPrimary root and data volumes to NFS3 C1a	Pass
test_02_nfs3_cluster_to_cluster	NFS3 C1a to C1b	Pass
test_03_nfs3_cluster_to_zone	NFS3 C1b to zone-wide Z1	Pass
test_04_nfs3_zone_to_zone	NFS3 Z1 to Z2	Pass
test_05_nfs3_zone_to_cluster	NFS3 Z2 back to C1a	Pass
test_06_iscsi_default_primary_to_cluster	DefaultPrimary root and data volumes to iSCSI C1a	Pass
test_07_iscsi_cluster_to_cluster	iSCSI C1a to C1b	Pass
test_08_iscsi_cluster_to_zone	iSCSI C1b to Z1	Pass
test_09_iscsi_zone_to_zone	iSCSI Z1 to Z2	Pass
test_10_iscsi_zone_to_cluster	iSCSI Z2 back to C1a	Pass
test_11_reject_nfs3_to_iscsi	Live NFS3-to-iSCSI mapping is rejected	Pass
test_12_reject_iscsi_to_nfs3	Live iSCSI-to-NFS3 mapping is rejected	Pass
test_13_reject_live_volume_only	`migrateVolume` with livemigrate on a running volume is rejected	Pass
test_14_nfs3_cluster_to_cluster	After host split, NFS3 C1a to C2	Pass
test_15_nfs3_cluster_to_zone	NFS3 C1a to Z1 onto a C2 host	Pass
test_16_nfs3_zone_to_cluster	NFS3 Z1 to C2	Pass
test_17_nfs3_zone_to_zone	NFS3 Z1 to Z2 onto a C2 host	Pass
test_18_iscsi_cluster_to_cluster	iSCSI C1a to C2 onto a C2 host	Pass
test_19_iscsi_cluster_to_zone	iSCSI C1a to Z1 onto a C2 host	Pass
test_20_iscsi_zone_to_cluster	iSCSI Z1 to C2	Pass
test_21_iscsi_zone_to_zone	iSCSI Z1 to Z2 onto a C2 host	Pass
test_22_reject_pool_not_reachable_from_destination_host	Cluster-1 pool mapped to a cluster-2 host is rejected	Pass

Stopped VM storage migration (`migrateVirtualMachineWithVolume`, no destination host)

Test	What it covers	Status
test_01_nfs3_default_primary_to_cluster	DefaultPrimary to NFS3 C1a	Pass
test_02_nfs3_cluster_to_cluster_same_cluster	NFS3 between cluster pools in the same cluster	Pass
test_03_nfs3_cluster_to_cluster_across_clusters	NFS3 to a pool in the second cluster	Pass
test_04_nfs3_cluster_to_zone	NFS3 cluster pool to zone-wide	Pass
test_05_nfs3_zone_to_zone	NFS3 between two zone-wide pools	Pass
test_06_nfs3_zone_to_cluster	NFS3 zone-wide back to C1a	Pass
test_07_iscsi_default_primary_to_cluster	DefaultPrimary to iSCSI C1a	Pass
test_08_iscsi_cluster_to_cluster_same_cluster	iSCSI between cluster pools in the same cluster	Pass
test_09_iscsi_cluster_to_cluster_across_clusters	iSCSI to a pool in the second cluster	Pass
test_10_iscsi_cluster_to_zone	iSCSI cluster pool to zone-wide	Pass
test_11_iscsi_zone_to_zone	iSCSI between two zone-wide pools	Pass
test_12_iscsi_zone_to_cluster	iSCSI zone-wide back to C1a	Pass
test_13_reject_nfs3_to_iscsi	Stopped-VM NFS3-to-iSCSI is rejected	Pass
test_14_reject_iscsi_to_nfs3	Stopped-VM iSCSI-to-NFS3 is rejected	Pass
test_15_reject_running_vm	Stopped-VM API form is rejected once the VM is running	Pass

Volume migration (`migrateVolume`)

Test	What it covers	Status
test_01_nfs3_detached_default_primary_to_cluster	Detached NFS3, DefaultPrimary to C1a	Pass
test_02_nfs3_detached_cluster_to_cluster_same_cluster	Detached NFS3, C1a to C1b	Pass
test_03_nfs3_detached_cluster_to_cluster_across_clusters	Detached NFS3, C1b to C2	Pass
test_04_nfs3_detached_cluster_to_zone	Detached NFS3, C2 to Z1	Pass
test_05_nfs3_detached_zone_to_zone	Detached NFS3, Z1 to Z2	Pass
test_06_nfs3_detached_zone_to_cluster	Detached NFS3, Z2 back to C1a	Pass
test_07_iscsi_detached_default_primary_to_cluster	Detached iSCSI, DefaultPrimary to C1a	Pass
test_08_iscsi_detached_cluster_to_cluster_same_cluster	Detached iSCSI, C1a to C1b	Pass
test_09_iscsi_detached_cluster_to_cluster_across_clusters	Detached iSCSI, C1b to C2	Pass
test_10_iscsi_detached_cluster_to_zone	Detached iSCSI, C2 to Z1	Pass
test_11_iscsi_detached_zone_to_zone	Detached iSCSI, Z1 to Z2	Pass
test_12_iscsi_detached_zone_to_cluster	Detached iSCSI, Z2 back to C1a	Pass
test_13_nfs3_attached_stopped_vm_cluster_to_zone	Stopped-attached NFS3 data, C1a to Z1; root stays	Pass
test_14_iscsi_attached_stopped_vm_cluster_to_zone	Stopped-attached iSCSI data, C1a to Z1; root stays	Pass
test_15_nfs3_attached_stopped_vm_default_to_ontap	Stopped-attached non-ONTAP data to ONTAP NFS3	Pass
test_16_iscsi_attached_stopped_vm_default_to_ontap	Stopped-attached non-ONTAP data to ONTAP iSCSI	Pass
test_17_reject_detached_nfs3_to_iscsi	Detached NFS3-to-iSCSI is rejected	Pass
test_18_reject_detached_iscsi_to_nfs3	Detached iSCSI-to-NFS3 is rejected	Pass
test_19_reject_stopped_attached_nfs3_to_iscsi	Stopped-attached NFS3-to-iSCSI is rejected	Pass
test_20_reject_stopped_attached_iscsi_to_nfs3	Stopped-attached iSCSI-to-NFS3 is rejected	Pass
test_21_reject_attached_running_vm_without_livemigrate	Running-attached NFS3 without livemigrate is rejected	Pass
test_22_reject_attached_running_vm_with_livemigrate	Live volume-only migration is rejected	Pass
test_23_reject_same_pool	Migration to the volume's current pool is rejected	Pass

github-actions · 2026-10-06T15:52:50Z

🔴 Test Coverage Grade: `D` — Marginal

Metric	Value
Line coverage	24.86%
Branch coverage	18.99%

Grade Scale

Grade	Line Coverage	Meaning
🟢 A	≥ 80%	Excellent - this code sleeps well at night 😴
🟡 B	60-79%	Good - almost there, don't stop now 😉
🟠 C	40-59%	Acceptable - your code is wearing a seatbelt, but no airbags 😬
🔴 D	20-39%	Marginal - boldly shipping where no test has gone before 🖖
⛔ F	< 20%	Failing - tests? what tests? 🔥

Branch coverage is shown as a secondary signal. Grade is determined by line coverage.
View full Actions run

github-actions · 2026-10-08T06:31:08Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

github-actions · 2026-10-14T15:40:03Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

github-actions · 2026-10-16T07:35:59Z

🔴 Test Coverage Grade: `D` — Marginal

Metric	Value
Line coverage	25.97%
Branch coverage	20.26%

Grade Scale

Grade	Line Coverage	Meaning
🟢 A	≥ 80%	Excellent - this code sleeps well at night 😴
🟡 B	60-79%	Good - almost there, don't stop now 😉
🟠 C	40-59%	Acceptable - your code is wearing a seatbelt, but no airbags 😬
🔴 D	20-39%	Marginal - boldly shipping where no test has gone before 🖖
⛔ F	< 20%	Failing - tests? what tests? 🔥

Branch coverage is shown as a secondary signal. Grade is determined by line coverage.
View full Actions run

github-actions · 2026-10-26T17:38:14Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

…ation # Conflicts: # plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java # plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java # plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriverTest.java # plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/service/UnifiedNASStrategyTest.java

…ject cross-protocol migration

… copying host

…hares

# Conflicts: # plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java # plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/service/UnifiedSANStrategyTest.java

…s complete

piyush5netapp

Approving with some comments which can be taken in future.

piyush5netapp · 2026-11-05T05:34:40Z

+            try {
+                destPool = storagePoolMgr.getStoragePool(destPrimaryStore.getPoolType(), destPrimaryStore.getUuid());
+            } catch (CloudRuntimeException e) {
+                if (!destPrimaryStore.isManaged() || !e.getMessage().contains("not found")) {


what this check to throw error only if it is unmanaged ?

Idea is to register the destination pool when it is a managed pool and is not found. Will make this code clear.

piyush5netapp · 2026-11-05T05:36:37Z

        }
    }

+    protected void disconnectDestinationOntapIscsiDisksOnSourceHost(final LibvirtComputingResource libvirtComputingResource,


is not method name confusing one ? what does destination ontap iscsi disk means ?

Also, I think the thing this method is taking care of should exist in ontap data motion strategy which ontapdatamotion strategy is already doing currently incase of failed migration. We can use the same method for successmigration also.

Check handleFailedMigration method in OntapDataMotionStrategy

Trying out an alternative, will let you know

piyush5netapp · 2026-11-05T06:29:55Z

Approving with some comments which can be taken in future.

Will wait for one comment reply on file LibvirtMigrateCommandWrapper

suryag1201 · 2026-11-06T06:04:49Z

+            try {
+                destPool = storagePoolMgr.getStoragePool(destPrimaryStore.getPoolType(), destPrimaryStore.getUuid());
+            } catch (CloudRuntimeException e) {
+                if (!destPrimaryStore.isManaged() || !e.getMessage().contains("not found")) {


cant compare with a stable error code instead error message? Null-check for msg is also required before contains.

Unfortunately, cloudstack is a monolith and 'getStoragePool' is not an api call 😢

suryag1201 · 2026-11-06T06:26:27Z

+            if (progress != null && Integer.valueOf(100).equals(progress.getPercentComplete())) {
+                return;
+            }
+            if (progress != null && ("failed".equalsIgnoreCase(progress.getState()) || "failure".equalsIgnoreCase(progress.getState())


what about the paused, paused_error state, how it is handled?

I believe paused and paused_error are rare occurrences. Unless storage administrator requests lun copy to be paused it is unlikely to happen on it's own. Further, migration in cloudstack has a timeout of 18mins. So, I feel this should be alright.

suryag1201 · 2026-11-06T06:28:52Z

+
+    protected void waitForLunCopy(String authHeader, String lunUuid, long deadline) {
+        while (true) {
+            Lun lun = sanFeignClient.getLunCopyStatus(authHeader, lunUuid);


there is a possibility that copy object is missing or null initially and comes after some time, this logic should read the copy value again

No, usually any WRITE Op in ONTAP is creating a DB entry and the GET call always returns it. If you remember, in another bug where GET lun is followed by PATCH lun, GET always responds with the object, while PATCH sometimes couldn't find the actual entity. So, this should be alright. Let's see if something gets uncovered in the future.

- LunMap: drop property-level NON_DEFAULT JsonInclude on logicalUnitNumber - KVMStorageProcessor: prefer copy details over command options, narrow not-found handling to managed volumes - OntapDataMotionStrategy: add disconnectVolumeFromHost helper used by failed and post-migration cleanup - LibvirtMigrateCommandWrapper: remove the disconnect wrapper method and its test - Add unit tests for the copy-details precedence and the new cleanup path

…ration QoS Offline migration calls createAsync with a null callback and reads no result, so a failed create must throw instead of returning silently. The post-migration QoS reapply now retries twice more with a short wait, then logs and continues, because the VM has already moved and a failed patch must not expunge its disks.

sandeeplocharla requested review from piyush5netapp, rajiv-jain-netapp and suryag1201 as code owners October 5, 2026 05:54

sandeeplocharla requested a review from sathvikaragi October 5, 2026 05:59

piyush5netapp reviewed Oct 5, 2026

View reviewed changes

Comment thread ...tion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java Resolved

sandeeplocharla force-pushed the feature/CSTACKEX-262 branch from 15f8e29 to ddcebda Compare October 5, 2026 06:26

sandeeplocharla marked this pull request as draft October 5, 2026 14:23

sandeeplocharla marked this pull request as ready for review October 7, 2026 01:02

piyush5netapp reviewed Oct 7, 2026

View reviewed changes

Comment thread engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java Resolved

rajiv-jain-netapp reviewed Oct 8, 2026

View reviewed changes

Comment thread engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java Resolved

rajiv-jain-netapp reviewed Oct 8, 2026

View reviewed changes

Comment thread ...volume/ontap/src/main/java/org/apache/cloudstack/storage/motion/OntapDataMotionStrategy.java Resolved

rajiv-jain-netapp reviewed Oct 8, 2026

View reviewed changes

Comment thread ...me/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java Resolved

github-actions Bot added the status:has-conflicts label Oct 8, 2026

rajiv-jain-netapp reviewed Oct 8, 2026

View reviewed changes

Comment thread ...age/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java Resolved

sandeeplocharla force-pushed the feature/CSTACKEX-262 branch 2 times, most recently from e5c27c5 to 9416f32 Compare October 12, 2026 06:10

github-actions Bot removed the status:has-conflicts label Oct 12, 2026

sandeeplocharla force-pushed the feature/CSTACKEX-262 branch from 9416f32 to 7bca4ca Compare October 12, 2026 07:35

github-actions Bot added the status:has-conflicts label Oct 14, 2026

suryag1201 reviewed Oct 15, 2026

View reviewed changes

sandeeplocharla force-pushed the feature/CSTACKEX-262 branch from 575b714 to 26664a6 Compare October 16, 2026 06:45

github-actions Bot removed the status:has-conflicts label Oct 16, 2026

sandeeplocharla force-pushed the feature/CSTACKEX-262 branch from 26664a6 to be02af2 Compare October 26, 2026 13:33

github-actions Bot added the status:has-conflicts label Oct 26, 2026

piyush5netapp reviewed Oct 27, 2026

View reviewed changes

sandeeplocharla added 10 commits November 4, 2026 07:12

CSTACKEX-262: Keep offline CopyCommand on compatible ONTAP NFS and re…

d821166

…ject cross-protocol migration

CSTACKEX-262: Use the remapped iSCSI LUN and register the pool on the…

9095897

… copying host

Got back the lost changes for iSCSI Offline volume case

aeaf1fd

Renamed a method in driver class

7326b27

CSTACKEX-262: Move ONTAP migration into the plugin and set live CPU s…

9a744a4

…hares

Addressed PR and claude review comments

93b9686

Changes to support migration of volumes with QoS

aa3d8eb

# Conflicts: # plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java # plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/service/UnifiedSANStrategyTest.java

Wait for ONTAP to report LUN copy progress before treating the copy a…

41ac927

…s complete

Report the ONTAP values that rejected a storage migration

6853195

sandeeplocharla force-pushed the feature/CSTACKEX-262 branch from fe0a3c6 to 6853195 Compare November 4, 2026 01:50

github-actions Bot removed the status:has-conflicts label Nov 4, 2026

sandeeplocharla added 2 commits November 4, 2026 08:49

Addressed review comments

1198c7d

Addressed build failure issues

c2550c2

piyush5netapp reviewed Nov 4, 2026

View reviewed changes

Comment thread ...age/volume/ontap/src/main/java/org/apache/cloudstack/storage/listener/OntapHostListener.java Resolved

piyush5netapp reviewed Nov 4, 2026

View reviewed changes

Comment thread ...ins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/LunMap.java Resolved

piyush5netapp approved these changes Nov 5, 2026

View reviewed changes

piyush5netapp reviewed Nov 5, 2026

View reviewed changes

Comment thread plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java Resolved

piyush5netapp reviewed Nov 5, 2026

View reviewed changes

piyush5netapp requested changes Nov 5, 2026

View reviewed changes

sandeeplocharla commented Nov 5, 2026

View reviewed changes

Comment thread plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java Resolved

suryag1201 reviewed Nov 6, 2026

View reviewed changes

sandeeplocharla added 2 commits November 6, 2026 16:08

Conversation

sandeeplocharla commented Oct 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Live VM with volumes (migrateVirtualMachineWithVolume)

Stopped VM storage migration (migrateVirtualMachineWithVolume, no destination host)

Volume migration (migrateVolume)

Uh oh!

Uh oh!

github-actions Bot commented Oct 6, 2026

🔴 Test Coverage Grade: D — Marginal

Grade Scale

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Oct 8, 2026

Uh oh!

Uh oh!

github-actions Bot commented Oct 14, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Oct 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔴 Test Coverage Grade: D — Marginal

Grade Scale

Uh oh!

github-actions Bot commented Oct 26, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

piyush5netapp left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

piyush5netapp commented Nov 5, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

sandeeplocharla commented Oct 5, 2026 •

edited

Loading

Live VM with volumes (`migrateVirtualMachineWithVolume`)

Stopped VM storage migration (`migrateVirtualMachineWithVolume`, no destination host)

Volume migration (`migrateVolume`)

🔴 Test Coverage Grade: `D` — Marginal

github-actions Bot commented Oct 16, 2026 •

edited

Loading

🔴 Test Coverage Grade: `D` — Marginal